Merge "Fix warnings"