Misc touch-ups