Various small tweaks from morfic and franco