FIX: Final fixes