FIX: Minor fixes from rebasing