Fix some tag/trunk merge issues