Fixed problems from last merge