Some bug fixes

World 2 fixes