Smal bug changes