Minor fixes :D