Small fixes :)