diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ApClassSessions/Today/Get.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ApClassSessions/Today/Get.scala
index 7d186895..6e2d33ec 100644
--- a/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ApClassSessions/Today/Get.scala
+++ b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ApClassSessions/Today/Get.scala
@@ -73,7 +73,7 @@ case class StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_Ap
 	offerExpDatetime: String,
 	signupId: Int,
 	foAlertDatetime: String,
-	permitOvercrowd: Option[Boolean],
+	permitOvercrowd: Boolean,
 )
 
 object StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups_ApClassWaitlistResult {
diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ApClassTypes/Get.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ApClassTypes/Get.scala
index 4c087a20..621e0eea 100644
--- a/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ApClassTypes/Get.scala
+++ b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ApClassTypes/Get.scala
@@ -11,17 +11,17 @@ import play.api.libs.json.{JsValue, Json}
 case class StaffRestApClassTypesGetResponseSuccessDto (
 	typeId: Int,
 	typeName: String,
-	ratingPrereq: Option[Double],
-	classPrereq: Option[Double],
-	ratingOverkill: Option[Double],
+	ratingPrereq: Option[Int],
+	classPrereq: Option[Int],
+	ratingOverkill: Option[Int],
 	displayOrder: Double,
 	descLong: String,
 	descShort: Option[String],
-	classOverkill: Option[Double],
+	classOverkill: Option[Int],
 	noSignup: Option[Boolean],
 	priceDefault: Option[Double],
-	signupMaxDefault: Option[Double],
-	signupMinDefault: Option[Double],
+	signupMaxDefault: Option[Int],
+	signupMinDefault: Option[Int],
 	disallowIfOverkill: Option[Boolean],
 	$$apClassFormats: List[StaffRestApClassTypesGetResponseSuccessDto_ApClassFormats],
 )
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassType.scala
index 335b1ef5..dc2f5970 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassType.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassType.scala
@@ -16,9 +16,9 @@ class ApClassType extends StorableClass(ApClassType) {
 	override object values extends ValuesObject {
 		val typeId = new IntFieldValue(self, ApClassType.fields.typeId)
 		val typeName = new StringFieldValue(self, ApClassType.fields.typeName)
-		val ratingPrereq = new NullableDoubleFieldValue(self, ApClassType.fields.ratingPrereq)
-		val classPrereq = new NullableDoubleFieldValue(self, ApClassType.fields.classPrereq)
-		val ratingOverkill = new NullableDoubleFieldValue(self, ApClassType.fields.ratingOverkill)
+		val ratingPrereq = new NullableIntFieldValue(self, ApClassType.fields.ratingPrereq)
+		val classPrereq = new NullableIntFieldValue(self, ApClassType.fields.classPrereq)
+		val ratingOverkill = new NullableIntFieldValue(self, ApClassType.fields.ratingOverkill)
 		val createdOn = new DateTimeFieldValue(self, ApClassType.fields.createdOn)
 		val createdBy = new StringFieldValue(self, ApClassType.fields.createdBy)
 		val updatedOn = new DateTimeFieldValue(self, ApClassType.fields.updatedOn)
@@ -26,12 +26,12 @@ class ApClassType extends StorableClass(ApClassType) {
 		val displayOrder = new DoubleFieldValue(self, ApClassType.fields.displayOrder)
 		val descLong = new StringFieldValue(self, ApClassType.fields.descLong)
 		val descShort = new NullableStringFieldValue(self, ApClassType.fields.descShort)
-		val classOverkill = new NullableDoubleFieldValue(self, ApClassType.fields.classOverkill)
+		val classOverkill = new NullableIntFieldValue(self, ApClassType.fields.classOverkill)
 		val colorCode = new NullableStringFieldValue(self, ApClassType.fields.colorCode)
 		val noSignup = new NullableBooleanFieldValue(self, ApClassType.fields.noSignup)
 		val priceDefault = new NullableDoubleFieldValue(self, ApClassType.fields.priceDefault)
-		val signupMaxDefault = new NullableDoubleFieldValue(self, ApClassType.fields.signupMaxDefault)
-		val signupMinDefault = new NullableDoubleFieldValue(self, ApClassType.fields.signupMinDefault)
+		val signupMaxDefault = new NullableIntFieldValue(self, ApClassType.fields.signupMaxDefault)
+		val signupMinDefault = new NullableIntFieldValue(self, ApClassType.fields.signupMinDefault)
 		val disallowIfOverkill = new NullableBooleanFieldValue(self, ApClassType.fields.disallowIfOverkill)
 		val teachUrl = new NullableStringFieldValue(self, ApClassType.fields.teachUrl)
 	}
@@ -45,9 +45,9 @@ object ApClassType extends StorableObject[ApClassType] {
 	object fields extends FieldsObject {
 		val typeId = new IntDatabaseField(self, "TYPE_ID")
 		val typeName = new StringDatabaseField(self, "TYPE_NAME", 200)
-		val ratingPrereq = new NullableDoubleDatabaseField(self, "RATING_PREREQ")
-		val classPrereq = new NullableDoubleDatabaseField(self, "CLASS_PREREQ")
-		val ratingOverkill = new NullableDoubleDatabaseField(self, "RATING_OVERKILL")
+		val ratingPrereq = new NullableIntDatabaseField(self, "RATING_PREREQ")
+		val classPrereq = new NullableIntDatabaseField(self, "CLASS_PREREQ")
+		val ratingOverkill = new NullableIntDatabaseField(self, "RATING_OVERKILL")
 		@NullableInDatabase
 		val createdOn = new DateTimeDatabaseField(self, "CREATED_ON")
 		@NullableInDatabase
@@ -60,12 +60,12 @@ object ApClassType extends StorableObject[ApClassType] {
 		@NullableInDatabase
 		val descLong = new StringDatabaseField(self, "DESC_LONG", -1)
 		val descShort = new NullableStringDatabaseField(self, "DESC_SHORT", -1)
-		val classOverkill = new NullableDoubleDatabaseField(self, "CLASS_OVERKILL")
+		val classOverkill = new NullableIntDatabaseField(self, "CLASS_OVERKILL")
 		val colorCode = new NullableStringDatabaseField(self, "COLOR_CODE", 6)
 		val noSignup = new NullableBooleanDatabaseField(self, "NO_SIGNUP")
 		val priceDefault = new NullableDoubleDatabaseField(self, "PRICE_DEFAULT")
-		val signupMaxDefault = new NullableDoubleDatabaseField(self, "SIGNUP_MAX_DEFAULT")
-		val signupMinDefault = new NullableDoubleDatabaseField(self, "SIGNUP_MIN_DEFAULT")
+		val signupMaxDefault = new NullableIntDatabaseField(self, "SIGNUP_MAX_DEFAULT")
+		val signupMinDefault = new NullableIntDatabaseField(self, "SIGNUP_MIN_DEFAULT")
 		val disallowIfOverkill = new NullableBooleanDatabaseField(self, "DISALLOW_IF_OVERKILL")
 		val teachUrl = new NullableStringDatabaseField(self, "TEACH_URL", 100)
 	}
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassWaitlistResult.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassWaitlistResult.scala
index ad12d6d7..e7042fd1 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassWaitlistResult.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassWaitlistResult.scala
@@ -15,7 +15,7 @@ class ApClassWaitlistResult extends StorableClass(ApClassWaitlistResult) {
 		val wlResult = new StringFieldValue(self, ApClassWaitlistResult.fields.wlResult)
 		val offerExpDatetime = new DateTimeFieldValue(self, ApClassWaitlistResult.fields.offerExpDatetime)
 		val foAlertDatetime = new DateTimeFieldValue(self, ApClassWaitlistResult.fields.foAlertDatetime)
-		val permitOvercrowd = new NullableBooleanFieldValue(self, ApClassWaitlistResult.fields.permitOvercrowd)
+		val permitOvercrowd = new BooleanFieldValue(self, ApClassWaitlistResult.fields.permitOvercrowd)
 		val createdOn = new DateTimeFieldValue(self, ApClassWaitlistResult.fields.createdOn)
 		val createdBy = new NullableStringFieldValue(self, ApClassWaitlistResult.fields.createdBy)
 		val updatedOn = new DateTimeFieldValue(self, ApClassWaitlistResult.fields.updatedOn)
@@ -36,7 +36,8 @@ object ApClassWaitlistResult extends StorableObject[ApClassWaitlistResult] {
 		val offerExpDatetime = new DateTimeDatabaseField(self, "OFFER_EXP_DATETIME")
 		@NullableInDatabase
 		val foAlertDatetime = new DateTimeDatabaseField(self, "FO_ALERT_DATETIME")
-		val permitOvercrowd = new NullableBooleanDatabaseField(self, "PERMIT_OVERCROWD")
+		@NullableInDatabase
+		val permitOvercrowd = new BooleanDatabaseField(self, "PERMIT_OVERCROWD", true)
 		@NullableInDatabase
 		val createdOn = new DateTimeDatabaseField(self, "CREATED_ON")
 		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)