Little fixes :)