Fixed problems from previous merge