Couple of fixes for ya :)