Let's correct some oopses due to bad manual code merge