FIX: general fixes