Merge "Fix minor warnings in code"