Minor fixes

Small fixes, committing so I can pull updates from branch