Fixed two time override bugs