Some minor cleanups
Fix breakage from last commits