FIX: Minor fixes