FIX: Various fixes