Fixed orientation issue when recording in CRP v2, minor bug fixes in DFM