Fixed more build warnings