Fixing errors so this will work again