Small fixes, cleanup

Tiny changes.