Fix issues with psychometrics and git import