Corrected a couple of relationship/enum configurations