a couple more fixes :)