Fixed remaining compile issues