Fixed issues with some model relationships, and added missing notNullable constraints.