fixing some more (master)