Small bug changes