Minor cleanup
Some fixes