3.0 - Fix stuff found in merge process, closes #1215