A few sanity tweaks