FIX: Multiple fixes