FIX: Multiple suggested fixes