FIX: Various issues