FIX: more fixes