Fixed start problems from Alex update