Fixing some compialtion errors