FIX: Minor cosmits