Oops more bugs