Fixed various outstanding issues