Fixed various minors