Misc cleanup, missing semicolons, etc