Merge "Fix errors and warnings"