Still yet more stupid bugs