Misc changes to make things work again