Fixed minor problems from previous commit