more fixes :P