iAdded fixes from Scottie