Merge "Clean up more warnings in lk code"