fixes more fixes