more fixes.. :)