FIX: Minor changes