Fix bad behaviors so it works in the meantime.