Fixed last merge issues