Fixed problems by bodged merge, plus fix