Fixed some post merge stuff