I raised a support ticket as it looks like my particular issues are unique (story of my life, eh!).