Minor bug changes