FIX: Minor tweaks