Misc cleanup

Misc. small fixes