Couple of fixes :)