Settler's Odyssey: Some bug fixes

Some bug fixes