Fixed remaining compiler warnings