Several minor fixes for moments to get tests/regressions working fully again