a bit more fixes