Fixed remaining compile errors