Fix academic status and customer factories