FIX: Many fixes