Fixing build warnings