Fixes to make it work again