Some bug changes