Merge "Remove warnings from code"