Fixing stuff that slipped through merge