ome more fixes