0.9 tweaks

Just some minor tweaks for the 0.9 branch