Assorted fixes and tweaks after feedback