Drewc/miscfix

Series of small fixes and tweaks.