diff --git a/account_prefs_inc.php b/account_prefs_inc.php
index 06f857af4c..607469293e 100644
--- a/account_prefs_inc.php
+++ b/account_prefs_inc.php
@@ -92,7 +92,7 @@ function edit_account_prefs($p_user_id = null, $p_error_if_protected = true, $p_
 				<label for="default-project-id"><span><?php echo lang_get( 'default_project' ) ?></span></label>
 				<span class="select">
 					<select id="default-project-id" name="default_project">
-						<?php print_project_option_list( $t_pref->default_project ) ?>
+						<?php print_project_option_list( (int)$t_pref->default_project ) ?>
 					</select>
 				</span>
 				<span class="label-style"></span>
@@ -118,117 +118,117 @@ function edit_account_prefs($p_user_id = null, $p_error_if_protected = true, $p_
 			<?php if ( ON == config_get( 'enable_email_notification' ) ) { ?>
 			<fieldset class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
 				<legend><label for="email-on-new"><?php echo lang_get( 'email_on_new' ) ?></label></legend>
-				<span class="checkbox"><input id="email-on-new" type="checkbox" name="email_on_new" <?php check_checked( $t_pref->email_on_new, ON ); ?> /></span>
+				<span class="checkbox"><input id="email-on-new" type="checkbox" name="email_on_new" <?php check_checked( (int)$t_pref->email_on_new, ON ); ?> /></span>
 				<label for="email-on-new-min-severity" class="email-on-severity-label"><span><?php echo lang_get( 'with_minimum_severity' ) ?></span></label>
 				<span class="select email-on-severity">
 					<select id="email-on-new-min-severity" name="email_on_new_min_severity">
 						<option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
 						<option disabled="disabled">-----</option>
-						<?php print_enum_string_option_list( 'severity', $t_pref->email_on_new_min_severity ) ?>
+						<?php print_enum_string_option_list( 'severity', (int)$t_pref->email_on_new_min_severity ) ?>
 					</select>
 				</span>
 				<span class="label-style"></span>
 			</fieldset>
 			<fieldset class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
 				<legend><label for="email-on-assigned"><?php echo lang_get( 'email_on_assigned' ) ?></label></legend>
-				<span class="checkbox"><input id="email-on-assigned" type="checkbox" name="email_on_assigned" <?php check_checked( $t_pref->email_on_assigned, ON ); ?> /></span>
+				<span class="checkbox"><input id="email-on-assigned" type="checkbox" name="email_on_assigned" <?php check_checked( (int)$t_pref->email_on_assigned, ON ); ?> /></span>
 				<label for="email-on-assigned-min-severity" class="email-on-severity-label"><span><?php echo lang_get( 'with_minimum_severity' ) ?></span></label>
 				<span class="select email-on-severity">
 					<select id="email-on-assigned-min-severity" name="email_on_assigned_min_severity">
 						<option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
 						<option disabled="disabled">-----</option>
-						<?php print_enum_string_option_list( 'severity', $t_pref->email_on_assigned_min_severity ) ?>
+						<?php print_enum_string_option_list( 'severity', (int)$t_pref->email_on_assigned_min_severity ) ?>
 					</select>
 				</span>
 				<span class="label-style"></span>
 			</fieldset>
 			<fieldset class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
 				<legend><label for="email-on-feedback"><?php echo lang_get( 'email_on_feedback' ) ?></label></legend>
-				<span class="checkbox"><input id="email-on-feedback" type="checkbox" name="email_on_feedback" <?php check_checked( $t_pref->email_on_feedback, ON ); ?> /></span>
+				<span class="checkbox"><input id="email-on-feedback" type="checkbox" name="email_on_feedback" <?php check_checked( (int)$t_pref->email_on_feedback, ON ); ?> /></span>
 				<label for="email-on-feedback-min-severity" class="email-on-severity-label"><span><?php echo lang_get( 'with_minimum_severity' ) ?></span></label>
 				<span class="select email-on-severity">
 					<select id="email-on-feedback-min-severity" name="email_on_feedback_min_severity">
 						<option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
 						<option disabled="disabled">-----</option>
-						<?php print_enum_string_option_list( 'severity', $t_pref->email_on_feedback_min_severity ) ?>
+						<?php print_enum_string_option_list( 'severity', (int)$t_pref->email_on_feedback_min_severity ) ?>
 					</select>
 				</span>
 				<span class="label-style"></span>
 			</fieldset>
 			<fieldset class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
 				<legend><label for="email-on-resolved"><?php echo lang_get( 'email_on_resolved' ) ?></label></legend>
-				<span class="checkbox"><input id="email-on-resolved" type="checkbox" name="email_on_resolved" <?php check_checked( $t_pref->email_on_resolved, ON ); ?> /></span>
+				<span class="checkbox"><input id="email-on-resolved" type="checkbox" name="email_on_resolved" <?php check_checked( (int)$t_pref->email_on_resolved, ON ); ?> /></span>
 				<label for="email-on-resolved-min-severity" class="email-on-severity-label"><span><?php echo lang_get( 'with_minimum_severity' ) ?></span></label>
 				<span class="select email-on-severity">
 					<select id="email-on-resolved-min-severity" name="email_on_resolved_min_severity">
 						<option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
 						<option disabled="disabled">-----</option>
-						<?php print_enum_string_option_list( 'severity', $t_pref->email_on_resolved_min_severity ) ?>
+						<?php print_enum_string_option_list( 'severity', (int)$t_pref->email_on_resolved_min_severity ) ?>
 					</select>
 				</span>
 				<span class="label-style"></span>
 			</fieldset>
 			<fieldset class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
 				<legend><label for="email-on-closed"><?php echo lang_get( 'email_on_closed' ) ?></label></legend>
-				<span class="checkbox"><input id="email-on-closed" type="checkbox" name="email_on_closed" <?php check_checked( $t_pref->email_on_closed, ON ); ?> /></span>
+				<span class="checkbox"><input id="email-on-closed" type="checkbox" name="email_on_closed" <?php check_checked( (int)$t_pref->email_on_closed, ON ); ?> /></span>
 				<label for="email-on-closed-min-severity" class="email-on-severity-label"><span><?php echo lang_get( 'with_minimum_severity' ) ?></span></label>
 				<span class="select email-on-severity">
 					<select id="email-on-closed-min-severity" name="email_on_closed_min_severity">
 						<option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
 						<option disabled="disabled">-----</option>
-						<?php print_enum_string_option_list( 'severity', $t_pref->email_on_closed_min_severity ) ?>
+						<?php print_enum_string_option_list( 'severity', (int)$t_pref->email_on_closed_min_severity ) ?>
 					</select>
 				</span>
 				<span class="label-style"></span>
 			</fieldset>
 			<fieldset class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
 				<legend><label for="email-on-reopened"><?php echo lang_get( 'email_on_reopened' ) ?></label></legend>
-				<span class="checkbox"><input id="email-on-reopened" type="checkbox" name="email_on_reopened" <?php check_checked( $t_pref->email_on_reopened, ON ); ?> /></span>
+				<span class="checkbox"><input id="email-on-reopened" type="checkbox" name="email_on_reopened" <?php check_checked( (int)$t_pref->email_on_reopened, ON ); ?> /></span>
 				<label for="email-on-reopened-min-severity" class="email-on-severity-label"><span><?php echo lang_get( 'with_minimum_severity' ) ?></span></label>
 				<span class="select email-on-severity">
 					<select id="email-on-reopened-min-severity" name="email_on_reopened_min_severity">
 						<option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
 						<option disabled="disabled">-----</option>
-						<?php print_enum_string_option_list( 'severity', $t_pref->email_on_reopened_min_severity ) ?>
+						<?php print_enum_string_option_list( 'severity', (int)$t_pref->email_on_reopened_min_severity ) ?>
 					</select>
 				</span>
 				<span class="label-style"></span>
 			</fieldset>
 			<fieldset class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
 				<legend><label for="email-on-bugnote-added"><?php echo lang_get( 'email_on_bugnote_added' ) ?></label></legend>
-				<span class="checkbox"><input id="email-on-bugnote-added" type="checkbox" name="email_on_bugnote" <?php check_checked( $t_pref->email_on_bugnote, ON ); ?> /></span>
+				<span class="checkbox"><input id="email-on-bugnote-added" type="checkbox" name="email_on_bugnote" <?php check_checked( (int)$t_pref->email_on_bugnote, ON ); ?> /></span>
 				<label for="email-on-bugnote-min-severity" class="email-on-severity-label"><span><?php echo lang_get( 'with_minimum_severity' ) ?></span></label>
 				<span class="select email-on-severity">
 					<select id="email-on-bugnote-min-severity" name="email_on_bugnote_min_severity">
 						<option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
 						<option disabled="disabled">-----</option>
-						<?php print_enum_string_option_list( 'severity', $t_pref->email_on_bugnote_min_severity ) ?>
+						<?php print_enum_string_option_list( 'severity', (int)$t_pref->email_on_bugnote_min_severity ) ?>
 					</select>
 				</span>
 				<span class="label-style"></span>
 			</fieldset>
 			<fieldset class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
 				<legend><label for="email-on-status"><?php echo lang_get( 'email_on_status_change' ) ?></label></legend>
-				<span class="checkbox"><input id="email-on-status" type="checkbox" name="email_on_status" <?php check_checked( $t_pref->email_on_status, ON ); ?> /></span>
+				<span class="checkbox"><input id="email-on-status" type="checkbox" name="email_on_status" <?php check_checked( (int)$t_pref->email_on_status, ON ); ?> /></span>
 				<label for="email-on-status-min-severity" class="email-on-severity-label"><span><?php echo lang_get( 'with_minimum_severity' ) ?></span></label>
 				<span class="select email-on-severity">
 					<select id="email-on-status-min-severity" name="email_on_status_min_severity">
 						<option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
 						<option disabled="disabled">-----</option>
-						<?php print_enum_string_option_list( 'severity', $t_pref->email_on_status_min_severity ) ?>
+						<?php print_enum_string_option_list( 'severity', (int)$t_pref->email_on_status_min_severity ) ?>
 					</select>
 				</span>
 				<span class="label-style"></span>
 			</fieldset>
 			<fieldset class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
 				<legend><label for="email-on-priority-change"><?php echo lang_get( 'email_on_priority_change' ) ?></label></legend>
-				<span class="checkbox"><input id="email-on-priority-change" type="checkbox" name="email_on_priority" <?php check_checked( $t_pref->email_on_priority , ON); ?> /></span>
+				<span class="checkbox"><input id="email-on-priority-change" type="checkbox" name="email_on_priority" <?php check_checked( (int)$t_pref->email_on_priority , ON); ?> /></span>
 				<label for="email-on-priority-min-severity" class="email-on-severity-label"><span><?php echo lang_get( 'with_minimum_severity' ) ?></span></label>
 				<span class="select email-on-severity">
 					<select id="email-on-priority-min-severity" name="email_on_priority_min_severity">
 						<option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
 						<option disabled="disabled">-----</option>
-						<?php print_enum_string_option_list( 'severity', $t_pref->email_on_priority_min_severity ) ?>
+						<?php print_enum_string_option_list( 'severity', (int)$t_pref->email_on_priority_min_severity ) ?>
 					</select>
 				</span>
 				<span class="label-style"></span>
diff --git a/bug_report_page.php b/bug_report_page.php
index 7d848eab91..1236c62c75 100644
--- a/bug_report_page.php
+++ b/bug_report_page.php
@@ -133,7 +133,7 @@
 	$f_description			= $t_bug->description;
 	$f_steps_to_reproduce	= $t_bug->steps_to_reproduce;
 	$f_additional_info		= $t_bug->additional_information;
-	$f_view_state			= $t_bug->view_state;
+	$f_view_state			= (int)$t_bug->view_state;
 	$f_due_date				= $t_bug->due_date;
 
 	$t_project_id			= $t_bug->project_id;
@@ -150,15 +150,15 @@
 	$f_handler_id			= gpc_get_int( 'handler_id', 0 );
 
 	$f_category_id			= gpc_get_int( 'category_id', 0 );
-	$f_reproducibility		= gpc_get_int( 'reproducibility', config_get( 'default_bug_reproducibility' ) );
-	$f_eta					= gpc_get_int( 'eta', config_get( 'default_bug_eta' ) );
-	$f_severity				= gpc_get_int( 'severity', config_get( 'default_bug_severity' ) );
-	$f_priority				= gpc_get_int( 'priority', config_get( 'default_bug_priority' ) );
+	$f_reproducibility		= gpc_get_int( 'reproducibility', (int)config_get( 'default_bug_reproducibility' ) );
+	$f_eta					= gpc_get_int( 'eta', (int)config_get( 'default_bug_eta' ) );
+	$f_severity				= gpc_get_int( 'severity', (int)config_get( 'default_bug_severity' ) );
+	$f_priority				= gpc_get_int( 'priority', (int)config_get( 'default_bug_priority' ) );
 	$f_summary				= gpc_get_string( 'summary', '' );
 	$f_description			= gpc_get_string( 'description', '' );
 	$f_steps_to_reproduce	= gpc_get_string( 'steps_to_reproduce', config_get( 'default_bug_steps_to_reproduce' ) );
 	$f_additional_info		= gpc_get_string( 'additional_info', config_get ( 'default_bug_additional_info' ) );
-	$f_view_state			= gpc_get_int( 'view_state', config_get( 'default_bug_view_status' ) );
+	$f_view_state			= gpc_get_int( 'view_state', (int)config_get( 'default_bug_view_status' ) );
 	$f_due_date				= gpc_get_string( 'due_date', '');
 
 	if ( $f_due_date == '' ) {
diff --git a/bug_update_advanced_page.php b/bug_update_advanced_page.php
index 58c1acb383..d1db64c1c3 100644
--- a/bug_update_advanced_page.php
+++ b/bug_update_advanced_page.php
@@ -229,7 +229,7 @@
 
 	if ( $tpl_can_change_view_state ) {
 		echo '<select ' . helper_get_tab_index() . ' id="view_state" name="view_state">';
-		print_enum_string_option_list( 'view_state', $tpl_bug->view_state);
+		print_enum_string_option_list( 'view_state', (int)$tpl_bug->view_state);
 		echo '</select>';
 	} else if ( $tpl_show_view_state ) {
 		echo $tpl_view_state;
@@ -449,7 +449,7 @@
 	if ( $tpl_show_eta ) {
 		echo '<th class="category"><label for="eta">' . lang_get( 'eta' ) . '</label></th>';
 		echo '<td><select ' . helper_get_tab_index() . ' id="eta" name="eta">';
-		print_enum_string_option_list( 'eta', $tpl_bug->eta );
+		print_enum_string_option_list( 'eta', (int)$tpl_bug->eta );
 		echo '</select></td>';
 	} else {
 		$t_spacer += 2;
diff --git a/core/filter_api.php b/core/filter_api.php
index debadc1bba..8946ec6c27 100644
--- a/core/filter_api.php
+++ b/core/filter_api.php
@@ -496,19 +496,19 @@ function filter_ensure_valid_filter( $p_filter_arr ) {
 
 	if( !isset( $p_filter_arr[FILTER_PROPERTY_PLATFORM] ) ) {
 		$p_filter_arr[FILTER_PROPERTY_PLATFORM] = array(
-			0 => META_FILTER_ANY,
+			0 => (string)META_FILTER_ANY,
 		);
 	}
 
 	if( !isset( $p_filter_arr[FILTER_PROPERTY_OS] ) ) {
 		$p_filter_arr[FILTER_PROPERTY_OS] = array(
-			0 => META_FILTER_ANY,
+			0 => (string)META_FILTER_ANY,
 		);
 	}
 
 	if( !isset( $p_filter_arr[FILTER_PROPERTY_OS_BUILD] ) ) {
 		$p_filter_arr[FILTER_PROPERTY_OS_BUILD] = array(
-			0 => META_FILTER_ANY,
+			0 => (string)META_FILTER_ANY,
 		);
 	}
 
@@ -555,7 +555,7 @@ function filter_ensure_valid_filter( $p_filter_arr ) {
 		$p_filter_arr[FILTER_PROPERTY_RELATIONSHIP_BUG] = gpc_get_int( FILTER_PROPERTY_RELATIONSHIP_BUG, 0 );
 	}
 	if( !isset( $p_filter_arr[FILTER_PROPERTY_TARGET_VERSION] ) ) {
-		$p_filter_arr[FILTER_PROPERTY_TARGET_VERSION] = META_FILTER_ANY;
+		$p_filter_arr[FILTER_PROPERTY_TARGET_VERSION] = (string)META_FILTER_ANY;
 	}
 	if( !isset( $p_filter_arr[FILTER_PROPERTY_TAG_STRING] ) ) {
 		$p_filter_arr[FILTER_PROPERTY_TAG_STRING] = gpc_get_string( FILTER_PROPERTY_TAG_STRING, '' );
@@ -582,7 +582,7 @@ function filter_ensure_valid_filter( $p_filter_arr ) {
 					break;
 
 				case FILTER_TYPE_MULTI_STRING:
-					$p_filter_arr[ $t_field_name ] = gpc_get_string_array( $t_field_name, array( 0 => META_FILTER_ANY ) );
+					$p_filter_arr[ $t_field_name ] = gpc_get_string_array( $t_field_name, array( 0 => (string)META_FILTER_ANY ) );
 					break;
 
 				case FILTER_TYPE_MULTI_INT:
@@ -590,7 +590,7 @@ function filter_ensure_valid_filter( $p_filter_arr ) {
 					break;
 
 				default:
-					$p_filter_arr[ $t_field_name ] = META_FILTER_ANY;
+					$p_filter_arr[ $t_field_name ] = (string)META_FILTER_ANY;
 			}
 		}
 
@@ -606,9 +606,9 @@ function filter_ensure_valid_filter( $p_filter_arr ) {
 	if( is_array( $t_custom_fields ) && ( count( $t_custom_fields ) > 0 ) ) {
 		foreach( $t_custom_fields as $t_cfid ) {
 			if( is_array( gpc_get( 'custom_field_' . $t_cfid, null ) ) ) {
-				$f_custom_fields_data[$t_cfid] = gpc_get_string_array( 'custom_field_' . $t_cfid, META_FILTER_ANY );
+				$f_custom_fields_data[$t_cfid] = gpc_get_string_array( 'custom_field_' . $t_cfid, (string)META_FILTER_ANY );
 			} else {
-				$f_custom_fields_data[$t_cfid] = gpc_get_string( 'custom_field_' . $t_cfid, META_FILTER_ANY );
+				$f_custom_fields_data[$t_cfid] = gpc_get_string( 'custom_field_' . $t_cfid, (string)META_FILTER_ANY );
 				$f_custom_fields_data[$t_cfid] = array(
 					$f_custom_fields_data[$t_cfid],
 				);
@@ -760,7 +760,7 @@ function filter_get_default() {
 
 	$t_filter = array(
 		FILTER_PROPERTY_CATEGORY_ID => Array(
-			'0' => META_FILTER_ANY,
+			'0' => (string)META_FILTER_ANY,
 		),
 		FILTER_PROPERTY_SEVERITY => Array(
 			'0' => META_FILTER_ANY,
@@ -782,10 +782,10 @@ function filter_get_default() {
 			'0' => META_FILTER_ANY,
 		),
 		FILTER_PROPERTY_BUILD => Array(
-			'0' => META_FILTER_ANY,
+			'0' => (string)META_FILTER_ANY,
 		),
 		FILTER_PROPERTY_VERSION => Array(
-			'0' => META_FILTER_ANY,
+			'0' => (string)META_FILTER_ANY,
 		),
 		FILTER_PROPERTY_HIDE_STATUS => Array(
 			'0' => $t_hide_status_default,
@@ -3386,7 +3386,7 @@ function filter_draw_selection_area2( $p_page_number, $p_for_screen = true, $p_e
 				<option value="-1"><?php echo '[' . lang_get( 'reset_query' ) . ']'?></option>
 				<option value="-1"></option>
 				<?php
-				$t_source_query_id = isset( $t_filter['_source_query_id'] ) ? $t_filter['_source_query_id'] : -1;
+				$t_source_query_id = isset( $t_filter['_source_query_id'] ) ? (int)$t_filter['_source_query_id'] : -1;
 				foreach( $t_stored_queries_arr as $t_query_id => $t_query_name ) {
 					echo '<option value="' . $t_query_id . '" ';
 					check_selected( $t_query_id, $t_source_query_id );
@@ -3540,7 +3540,7 @@ function print_filter_show_category() {
 	?>
 		<!-- Category -->
 		<select<?php echo $t_select_modifier;?> name="<?php echo FILTER_PROPERTY_CATEGORY_ID;?>[]">
-			<option value="<?php echo META_FILTER_ANY?>"<?php check_selected( $t_filter[FILTER_PROPERTY_CATEGORY_ID], META_FILTER_ANY );?>>[<?php echo lang_get( 'any' )?>]</option>
+			<option value="<?php echo META_FILTER_ANY?>"<?php check_selected( $t_filter[FILTER_PROPERTY_CATEGORY_ID], (string)META_FILTER_ANY );?>>[<?php echo lang_get( 'any' )?>]</option>
 			<?php print_category_filter_option_list( $t_filter[FILTER_PROPERTY_CATEGORY_ID] )?>
 		</select>
 		<?php
@@ -3555,7 +3555,7 @@ function print_filter_platform() {
 	?>
 		<!-- Platform -->
 		<select<?php echo $t_select_modifier;?> name="<?php echo FILTER_PROPERTY_PLATFORM;?>[]">
-			<option value="<?php echo META_FILTER_ANY?>"<?php check_selected( $t_filter[FILTER_PROPERTY_PLATFORM], META_FILTER_ANY );?>>[<?php echo lang_get( 'any' )?>]</option>
+			<option value="<?php echo META_FILTER_ANY?>"<?php check_selected( $t_filter[FILTER_PROPERTY_PLATFORM], (string)META_FILTER_ANY );?>>[<?php echo lang_get( 'any' )?>]</option>
 			<?php
 				log_event( LOG_FILTERING, 'Platform = ' . var_export( $t_filter[FILTER_PROPERTY_PLATFORM], true ) );
 	print_platform_option_list( $t_filter[FILTER_PROPERTY_PLATFORM] );
@@ -3573,7 +3573,7 @@ function print_filter_os() {
 	?>
 		<!-- OS -->
 		<select<?php echo $t_select_modifier;?> name="<?php echo FILTER_PROPERTY_OS;?>[]">
-			<option value="<?php echo META_FILTER_ANY?>"<?php check_selected( $t_filter[FILTER_PROPERTY_OS], META_FILTER_ANY );?>>[<?php echo lang_get( 'any' )?>]</option>
+			<option value="<?php echo META_FILTER_ANY?>"<?php check_selected( $t_filter[FILTER_PROPERTY_OS], (string)META_FILTER_ANY );?>>[<?php echo lang_get( 'any' )?>]</option>
 			<?php print_os_option_list( $t_filter[FILTER_PROPERTY_OS] )?>
 		</select>
 		<?php
@@ -3588,7 +3588,7 @@ function print_filter_os_build() {
 	?>
 		<!-- OS Build -->
 		<select<?php echo $t_select_modifier;?> name="<?php echo FILTER_PROPERTY_OS_BUILD;?>[]">
-			<option value="<?php echo META_FILTER_ANY?>"<?php check_selected( $t_filter[FILTER_PROPERTY_OS_BUILD], META_FILTER_ANY );?>>[<?php echo lang_get( 'any' )?>]</option>
+			<option value="<?php echo META_FILTER_ANY?>"<?php check_selected( $t_filter[FILTER_PROPERTY_OS_BUILD], (string)META_FILTER_ANY );?>>[<?php echo lang_get( 'any' )?>]</option>
 			<?php print_os_build_option_list( $t_filter[FILTER_PROPERTY_OS_BUILD] )?>
 		</select>
 		<?php
@@ -3653,8 +3653,8 @@ function print_filter_show_build() {
 	global $t_select_modifier, $t_filter;
 	?><!-- Build -->
 		<select<?php echo $t_select_modifier;?> name="<?php echo FILTER_PROPERTY_BUILD;?>[]">
-			<option value="<?php echo META_FILTER_ANY?>"<?php check_selected( $t_filter[FILTER_PROPERTY_BUILD], META_FILTER_ANY );?>>[<?php echo lang_get( 'any' )?>]</option>
-			<option value="<?php echo META_FILTER_NONE?>"<?php check_selected( $t_filter[FILTER_PROPERTY_BUILD], META_FILTER_NONE );?>>[<?php echo lang_get( 'none' )?>]</option>
+			<option value="<?php echo META_FILTER_ANY?>"<?php check_selected( $t_filter[FILTER_PROPERTY_BUILD], (string)META_FILTER_ANY );?>>[<?php echo lang_get( 'any' )?>]</option>
+			<option value="<?php echo META_FILTER_NONE?>"<?php check_selected( $t_filter[FILTER_PROPERTY_BUILD], (string)META_FILTER_NONE );?>>[<?php echo lang_get( 'none' )?>]</option>
 			<?php print_build_option_list( $t_filter[FILTER_PROPERTY_BUILD] )?>
 		</select>
 		<?php
@@ -3667,8 +3667,8 @@ function print_filter_show_version() {
 	global $t_select_modifier, $t_filter;
 	?><!-- Version -->
 		<select<?php echo $t_select_modifier;?> name="<?php echo FILTER_PROPERTY_VERSION;?>[]">
-			<option value="<?php echo META_FILTER_ANY?>"<?php check_selected( $t_filter[FILTER_PROPERTY_VERSION], META_FILTER_ANY );?>>[<?php echo lang_get( 'any' )?>]</option>
-			<option value="<?php echo META_FILTER_NONE?>"<?php check_selected( $t_filter[FILTER_PROPERTY_VERSION], META_FILTER_NONE );?>>[<?php echo lang_get( 'none' )?>]</option>
+			<option value="<?php echo META_FILTER_ANY?>"<?php check_selected( $t_filter[FILTER_PROPERTY_VERSION], (string)META_FILTER_ANY );?>>[<?php echo lang_get( 'any' )?>]</option>
+			<option value="<?php echo META_FILTER_NONE?>"<?php check_selected( $t_filter[FILTER_PROPERTY_VERSION], (string)META_FILTER_NONE );?>>[<?php echo lang_get( 'none' )?>]</option>
 			<?php print_version_option_list( $t_filter[FILTER_PROPERTY_VERSION], /* projectId */ null, /* released */ VERSION_ALL, /* leadingBlank */ false, /* withSubs */ true )?>
 		</select>
 		<?php
@@ -3681,8 +3681,8 @@ function print_filter_show_fixed_in_version() {
 	global $t_select_modifier, $t_filter;
 	?><!-- Fixed in Version -->
 		<select<?php echo $t_select_modifier;?> name="<?php echo FILTER_PROPERTY_FIXED_IN_VERSION;?>[]">
-			<option value="<?php echo META_FILTER_ANY?>"<?php check_selected( $t_filter[FILTER_PROPERTY_FIXED_IN_VERSION], META_FILTER_ANY );?>>[<?php echo lang_get( 'any' )?>]</option>
-			<option value="<?php echo META_FILTER_NONE?>"<?php check_selected( $t_filter[FILTER_PROPERTY_FIXED_IN_VERSION], META_FILTER_NONE );?>>[<?php echo lang_get( 'none' )?>]</option>
+			<option value="<?php echo META_FILTER_ANY?>"<?php check_selected( $t_filter[FILTER_PROPERTY_FIXED_IN_VERSION], (string)META_FILTER_ANY );?>>[<?php echo lang_get( 'any' )?>]</option>
+			<option value="<?php echo META_FILTER_NONE?>"<?php check_selected( $t_filter[FILTER_PROPERTY_FIXED_IN_VERSION], (string)META_FILTER_NONE );?>>[<?php echo lang_get( 'none' )?>]</option>
 			<?php print_version_option_list( $t_filter[FILTER_PROPERTY_FIXED_IN_VERSION], /* projectId */ null, /* released */ VERSION_ALL, /* leadingBlank */ false, /* withSubs */ true )?>
 		</select>
 		<?php
@@ -3695,8 +3695,8 @@ function print_filter_show_target_version() {
 	global $t_select_modifier, $t_filter;
 	?><!-- Fixed in Version -->
 		<select<?php echo $t_select_modifier;?> name="<?php echo FILTER_PROPERTY_TARGET_VERSION;?>[]">
-			<option value="<?php echo META_FILTER_ANY?>"<?php check_selected( $t_filter[FILTER_PROPERTY_TARGET_VERSION], META_FILTER_ANY );?>>[<?php echo lang_get( 'any' )?>]</option>
-			<option value="<?php echo META_FILTER_NONE?>"<?php check_selected( $t_filter[FILTER_PROPERTY_TARGET_VERSION], META_FILTER_NONE );?>>[<?php echo lang_get( 'none' )?>]</option>
+			<option value="<?php echo META_FILTER_ANY?>"<?php check_selected( $t_filter[FILTER_PROPERTY_TARGET_VERSION], (string)META_FILTER_ANY );?>>[<?php echo lang_get( 'any' )?>]</option>
+			<option value="<?php echo META_FILTER_NONE?>"<?php check_selected( $t_filter[FILTER_PROPERTY_TARGET_VERSION], (string)META_FILTER_NONE );?>>[<?php echo lang_get( 'none' )?>]</option>
 			<?php print_version_option_list( $t_filter[FILTER_PROPERTY_TARGET_VERSION], /* projectId */ null, /* released */ VERSION_ALL, /* leadingBlank */ false, /* withSubs */ true )?>
 		</select>
 		<?php
@@ -4005,13 +4005,13 @@ function print_filter_custom_field( $p_field_id ) {
 		} else {
 			echo '<select' . $t_select_modifier . ' name="custom_field_' . $p_field_id . '[]">';
 			echo '<option value="' . META_FILTER_ANY . '"';
-			check_selected( $t_filter['custom_fields'][$p_field_id], META_FILTER_ANY );
+			check_selected( $t_filter['custom_fields'][$p_field_id], (string)META_FILTER_ANY );
 			echo '>[' . lang_get( 'any' ) . ']</option>';
 
 			# don't show META_FILTER_NONE for enumerated types as it's not possible for them to be blank
 			if( !in_array( $t_accessible_custom_fields_types[$j], array( CUSTOM_FIELD_TYPE_ENUM, CUSTOM_FIELD_TYPE_LIST, CUSTOM_FIELD_TYPE_MULTILIST ) ) ) {
 				echo '<option value="' . META_FILTER_NONE . '"';
-				check_selected( $t_filter['custom_fields'][$p_field_id], META_FILTER_NONE );
+				check_selected( $t_filter['custom_fields'][$p_field_id], (string)META_FILTER_NONE );
 				echo '>[' . lang_get( 'none' ) . ']</option>';
 			}
 			if( is_array( $t_accessible_custom_fields_values[$j] ) ) {
diff --git a/core/helper_api.php b/core/helper_api.php
index e3553a2fa0..0952b29437 100644
--- a/core/helper_api.php
+++ b/core/helper_api.php
@@ -199,6 +199,12 @@ function get_enum_element( $p_enum_name, $p_val ) {
 function check_checked( $p_var, $p_val = true ) {
 	if( is_array( $p_var ) ) {
 		foreach( $p_var as $t_this_var ) {
+			if ( gettype( $t_this_var ) !== gettype( $p_val ) ) {
+				# Reaching this point is a a sign that you need to
+				# check the types of the parameters passed to this
+				# function. They should match.
+				trigger_error( ERROR_GENERIC, ERROR );
+			}
 			# We need to be careful when comparing an array of
 			# version number strings (["1.0", "1.1", "1.10"]) to
 			# a selected version number of "1.10". If a ==
@@ -223,6 +229,12 @@ function check_checked( $p_var, $p_val = true ) {
 			}
 		}
 	} else {
+		if ( gettype( $p_var ) !== gettype( $p_val ) ) {
+			# Reaching this point is a a sign that you need to
+			# check the types of the parameters passed to this
+			# function. They should match.
+			trigger_error( ERROR_GENERIC, ERROR );
+		}
 		# Refer to the comment above for the is_array($p_var)===true
 		# case. The same reasoning applies here too!
 		if( $p_var === $p_val ) {
@@ -246,6 +258,12 @@ function check_checked( $p_var, $p_val = true ) {
 function check_selected( $p_var, $p_val = true ) {
 	if ( is_array( $p_var ) ) {
 		foreach ( $p_var as $t_this_var ) {
+			if ( gettype( $t_this_var ) !== gettype( $p_val ) ) {
+				# Reaching this point is a a sign that you need to
+				# check the types of the parameters passed to this
+				# function. They should match.
+				trigger_error( ERROR_GENERIC, ERROR );
+			}
 			# Refer to the comment in this same place within the
 			# check_checked function. The same reasoning applies
 			# here too!
@@ -255,6 +273,12 @@ function check_selected( $p_var, $p_val = true ) {
 			}
 		}
 	} else {
+		if ( gettype( $p_var ) !== gettype( $p_val ) ) {
+			# Reaching this point is a a sign that you need to
+			# check the types of the parameters passed to this
+			# function. They should match.
+			trigger_error( ERROR_GENERIC, ERROR );
+		}
 		#Refer to the comment in this same place within the
 		# check_checked function. The same reasoning applies here too!
 		if ( $p_var === $p_val ) {
diff --git a/core/html_api.php b/core/html_api.php
index 0014967f81..d6ae6943f5 100644
--- a/core/html_api.php
+++ b/core/html_api.php
@@ -1497,7 +1497,7 @@ function html_button_bug_assign_to( $p_bug_id ) {
 	$t_already_selected = false;
 
 	foreach( $t_options as $t_entry ) {
-		$t_id = string_attribute( $t_entry[0] );
+		$t_id = (int)$t_entry[0];
 		$t_caption = string_attribute( $t_entry[1] );
 
 		# if current user and reporter can't be selected, then select the first
diff --git a/core/plugin_api.php b/core/plugin_api.php
index 94d4cbc044..2e8de014a9 100644
--- a/core/plugin_api.php
+++ b/core/plugin_api.php
@@ -537,7 +537,7 @@ function plugin_protected( $p_basename ) {
 		return 1;
 	}
 
-	return $g_plugin_cache_protected[$p_basename];
+	return (bool)$g_plugin_cache_protected[$p_basename];
 }
 
 /**
@@ -553,7 +553,7 @@ function plugin_priority( $p_basename ) {
 		return 3;
 	}
 
-	return $g_plugin_cache_priority[$p_basename];
+	return (int)$g_plugin_cache_priority[$p_basename];
 }
 
 # ## Plugin management functions
diff --git a/core/print_api.php b/core/print_api.php
index 4b5bdc1f93..a2770047c5 100644
--- a/core/print_api.php
+++ b/core/print_api.php
@@ -274,7 +274,7 @@ function print_user_option_list( $p_user_id, $p_project_id = null, $p_access = A
 	for( $i = 0;$i < $t_count;$i++ ) {
 		$t_row = $t_users[$i];
 		echo '<option value="' . $t_row['id'] . '" ';
-		check_selected( $p_user_id, $t_row['id'] );
+		check_selected( $p_user_id, (int)$t_row['id'] );
 		echo '>' . $t_display[$i] . '</option>';
 	}
 }
@@ -477,7 +477,9 @@ function print_project_option_list( $p_project_id = null, $p_include_all_project
 
 	if( $p_include_all_projects ) {
 		echo '<option value="' . ALL_PROJECTS . '"';
-		check_selected( $p_project_id, ALL_PROJECTS );
+		if ( $p_project_id !== null ) {
+			check_selected( (int)$p_project_id, ALL_PROJECTS );
+		}
 		echo '>' . lang_get( 'all_projects' ) . '</option>' . "\n";
 	}
 
@@ -486,7 +488,9 @@ function print_project_option_list( $p_project_id = null, $p_include_all_project
 		$t_id = $t_project_ids[$i];
 		if( $t_id != $p_filter_project_id ) {
 			echo '<option value="' . $t_id . '"';
-			check_selected( $p_project_id, $t_id );
+			if ( $p_project_id !== null ) {
+				check_selected( (int)$p_project_id, $t_id );
+			}
 			echo '>' . string_attribute( project_get_field( $t_id, 'name' ) ) . '</option>' . "\n";
 			print_subproject_option_list( $t_id, $p_project_id, $p_filter_project_id, $p_trace, Array() );
 		}
@@ -507,7 +511,9 @@ function print_subproject_option_list( $p_parent_id, $p_project_id = null, $p_fi
 				$t_full_id = join( $p_parents, ";" ) . ';' . $t_id;
 			}
 			echo $t_full_id . '"';
-			check_selected( $p_project_id, $t_full_id );
+			if ( $p_project_id !== null ) {
+				check_selected( $p_project_id, $t_full_id );
+			}
 			echo '>' . str_repeat( '&#160;', count( $p_parents ) ) . str_repeat( '&#187;', count( $p_parents ) ) . ' ' . string_attribute( project_get_field( $t_id, 'name' ) ) . '</option>' . "\n";
 			print_subproject_option_list( $t_id, $p_project_id, $p_filter_project_id, $p_trace, $p_parents );
 		}
@@ -554,7 +560,9 @@ function print_profile_option_list_from_profiles( $p_profiles, $p_select_id ) {
 		$t_os_build = string_attribute( $t_profile['os_build'] );
 
 		echo '<option value="' . $t_profile['id'] . '"';
-		check_selected( $p_select_id, $t_profile['id'] );
+		if ( $p_select_id !== false ) {
+			check_selected( $p_select_id, (int)$t_profile['id'] );
+		}
 		echo '>' . $t_platform . ' ' . $t_os . ' ' . $t_os_build . '</option>';
 	}
 }
@@ -586,7 +594,7 @@ function print_category_option_list( $p_category_id = 0, $p_project_id = null )
 	$cat_arr = category_get_all_rows( $t_project_id, /* inherit */ null, /* sortByProject */ true );
 
 	foreach( $cat_arr as $t_category_row ) {
-		$t_category_id = $t_category_row['id'];
+		$t_category_id = (int)$t_category_row['id'];
 		echo "<option value=\"$t_category_id\"";
 		check_selected( $p_category_id, $t_category_id );
 		echo '>' . string_attribute( category_full_name( $t_category_id, $t_category_row['project_id'] != $t_project_id ) ) . '</option>';
@@ -606,7 +614,7 @@ function print_category_filter_option_list( $p_category_name = '', $p_project_id
 	foreach( $t_cat_arr as $t_cat ) {
 		$t_name = string_attribute( $t_cat );
 		echo '<option value="' . $t_name . '"';
-		check_selected( string_attribute( $p_category_name ), $t_name );
+		check_selected( $p_category_name, $t_cat );
 		echo '>' . $t_name . '</option>';
 	}
 }
@@ -616,10 +624,10 @@ function print_category_filter_option_list( $p_category_name = '', $p_project_id
 function print_platform_option_list( $p_platform, $p_user_id = null ) {
 	$t_platforms_array = profile_get_field_all_for_user( 'platform', $p_user_id );
 
-	foreach( $t_platforms_array as $t_platform ) {
-		$t_platform = string_attribute( $t_platform );
+	foreach( $t_platforms_array as $t_platform_unescaped ) {
+		$t_platform = string_attribute( $t_platform_unescaped );
 		echo '<option value="' . $t_platform . '"';
-		check_selected( string_attribute( $p_platform ), $t_platform );
+		check_selected( $p_platform, $t_platform_unescaped );
 		echo '>' . $t_platform . '</option>';
 	}
 }
@@ -629,10 +637,10 @@ function print_platform_option_list( $p_platform, $p_user_id = null ) {
 function print_os_option_list( $p_os, $p_user_id = null ) {
 	$t_os_array = profile_get_field_all_for_user( 'os', $p_user_id );
 
-	foreach( $t_os_array as $t_os ) {
-		$t_os = string_attribute( $t_os );
+	foreach( $t_os_array as $t_os_unescaped ) {
+		$t_os = string_attribute( $t_os_unescaped );
 		echo '<option value="' . $t_os . '"';
-		check_selected( string_attribute( $p_os ), $t_os );
+		check_selected( $p_os, $t_os_unescaped );
 		echo '>' . $t_os . '</option>';
 	}
 }
@@ -641,10 +649,10 @@ function print_os_option_list( $p_os, $p_user_id = null ) {
 function print_os_build_option_list( $p_os_build, $p_user_id = null ) {
 	$t_os_build_array = profile_get_field_all_for_user( 'os_build', $p_user_id );
 
-	foreach( $t_os_build_array as $t_os_build ) {
-		$t_os_build = string_attribute( $t_os_build );
+	foreach( $t_os_build_array as $t_os_build_unescaped ) {
+		$t_os_build = string_attribute( $t_os_build_unescaped );
 		echo '<option value="' . $t_os_build . '"';
-		check_selected( string_attribute( $p_os_build ), $t_os_build );
+		check_selected( $p_os_build, $t_os_build_unescaped );
 		echo '>' . $t_os_build . '</option>';
 	}
 }
@@ -706,7 +714,7 @@ function print_version_option_list( $p_version = '', $p_project_id = null, $p_re
 		if ( !in_array( $t_version, $t_listed ) ) {
 			$t_listed[] = $t_version;
 			echo '<option value="' . $t_version . '"';
-			check_selected( string_attribute( $p_version ), $t_version );
+			check_selected( $p_version, $version['version'] );
 
 			$t_version_string = string_attribute( prepare_version_string( $c_project_id, $version['id'] ) );
 
@@ -738,10 +746,10 @@ function print_build_option_list( $p_build = '' ) {
 
 	$t_max_length = config_get( 'max_dropdown_length' );
 
-	foreach( $t_overall_build_arr as $t_build ) {
-		$t_build = string_attribute( $t_build );
+	foreach( $t_overall_build_arr as $t_build_unescaped ) {
+		$t_build = string_attribute( $t_build_unescaped );
 		echo "<option value=\"$t_build\"";
-		check_selected( string_attribute( $p_build ), $t_build );
+		check_selected( $p_build, $t_build_unescaped );
 		echo ">" . string_shorten( $t_build, $t_max_length ) . "</option>";
 	}
 }
diff --git a/core/profile_api.php b/core/profile_api.php
index 742c35409f..54fd335dd6 100644
--- a/core/profile_api.php
+++ b/core/profile_api.php
@@ -335,7 +335,7 @@ function profile_get_default( $p_user_id ) {
 			WHERE user_id=" . db_param();
 	$result = db_query_bound( $query, Array( $c_user_id ) );
 
-	$t_default_profile = db_result( $result, 0, 0 );
+	$t_default_profile = (int)db_result( $result, 0, 0 );
 
 	return $t_default_profile;
 }
diff --git a/manage_custom_field_edit_page.php b/manage_custom_field_edit_page.php
index 33ebb12db0..774d615c4e 100644
--- a/manage_custom_field_edit_page.php
+++ b/manage_custom_field_edit_page.php
@@ -82,7 +82,7 @@
 				<label for="custom-field-type"><span><?php echo lang_get( 'custom_field_type' ) ?></span></label>
 				<span class="select">
 					<select id="custom-field-type" name="type">
-						<?php print_enum_string_option_list( 'custom_field_type', $t_definition['type'] ) ?>
+						<?php print_enum_string_option_list( 'custom_field_type', (int)$t_definition['type'] ) ?>
 					</select>
 				</span>
 				<span class="label-style"></span>
@@ -106,7 +106,7 @@
 				<label for="custom-field-access-level-r"><span><?php echo lang_get( 'custom_field_access_level_r' ) ?></span></label>
 				<span class="select">
 					<select id="custom-field-access-level-r" name="access_level_r">
-						<?php print_enum_string_option_list( 'access_levels', $t_definition['access_level_r'] ) ?>
+						<?php print_enum_string_option_list( 'access_levels', (int)$t_definition['access_level_r'] ) ?>
 					</select>
 				</span>
 				<span class="label-style"></span>
@@ -115,7 +115,7 @@
 				<label for="custom-field-access-level-rw"><span><?php echo lang_get( 'custom_field_access_level_rw' ) ?></span></label>
 				<span class="select">
 					<select id="custom-field-access-level-rw" name="access_level_rw">
-						<?php print_enum_string_option_list( 'access_levels', $t_definition['access_level_rw'] ) ?>
+						<?php print_enum_string_option_list( 'access_levels', (int)$t_definition['access_level_rw'] ) ?>
 					</select>
 				</span>
 				<span class="label-style"></span>
@@ -137,42 +137,42 @@
 			</div>
 			<div class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
 				<label for="custom-field-display-report"><span><?php echo lang_get( 'custom_field_display_report' ) ?></span></label>
-				<span class="checkbox"><input type="checkbox" id="custom-field-display-report" name="display_report" value="1" <?php check_checked( $t_definition['display_report'] ) ?> /></span>
+				<span class="checkbox"><input type="checkbox" id="custom-field-display-report" name="display_report" value="1" <?php check_checked( (bool)$t_definition['display_report'] ) ?> /></span>
 				<span class="label-style"></span>
 			</div>
 			<div class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
 				<label for="custom-field-display-update"><span><?php echo lang_get( 'custom_field_display_update' ) ?></span></label>
-				<span class="checkbox"><input type="checkbox" id="custom-field-display-update" name="display_update" value="1" <?php check_checked( $t_definition['display_update'] ) ?> /></span>
+				<span class="checkbox"><input type="checkbox" id="custom-field-display-update" name="display_update" value="1" <?php check_checked( (bool)$t_definition['display_update'] ) ?> /></span>
 				<span class="label-style"></span>
 			</div>
 			<div class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
 				<label for="custom-field-display-resolved"><span><?php echo lang_get( 'custom_field_display_resolved' ) ?></span></label>
-				<span class="checkbox"><input type="checkbox" id="custom-field-display-resolved" name="display_resolved" value="1" <?php check_checked( $t_definition['display_resolved'] ) ?> /></span>
+				<span class="checkbox"><input type="checkbox" id="custom-field-display-resolved" name="display_resolved" value="1" <?php check_checked( (bool)$t_definition['display_resolved'] ) ?> /></span>
 				<span class="label-style"></span>
 			</div>
 			<div class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
 				<label for="custom-field-display-closed"><span><?php echo lang_get( 'custom_field_display_closed' ) ?></span></label>
-				<span class="checkbox"><input type="checkbox" id="custom-field-display-closed" name="display_closed" value="1" <?php check_checked( $t_definition['display_closed'] ) ?> /></span>
+				<span class="checkbox"><input type="checkbox" id="custom-field-display-closed" name="display_closed" value="1" <?php check_checked( (bool)$t_definition['display_closed'] ) ?> /></span>
 				<span class="label-style"></span>
 			</div>
 			<div class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
 				<label for="custom-field-require-report"><span><?php echo lang_get( 'custom_field_require_report' ) ?></span></label>
-				<span class="checkbox"><input type="checkbox" id="custom-field-require-report" name="require_report" value="1" <?php check_checked( $t_definition['require_report'] ) ?> /></span>
+				<span class="checkbox"><input type="checkbox" id="custom-field-require-report" name="require_report" value="1" <?php check_checked( (bool)$t_definition['require_report'] ) ?> /></span>
 				<span class="label-style"></span>
 			</div>
 			<div class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
 				<label for="custom-field-require-update"><span><?php echo lang_get( 'custom_field_require_update' ) ?></span></label>
-				<span class="checkbox"><input type="checkbox" id="custom-field-require-update" name="require_update" value="1" <?php check_checked( $t_definition['require_update'] ) ?> /></span>
+				<span class="checkbox"><input type="checkbox" id="custom-field-require-update" name="require_update" value="1" <?php check_checked( (bool)$t_definition['require_update'] ) ?> /></span>
 				<span class="label-style"></span>
 			</div>
 			<div class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
 				<label for="custom-field-require-resolved"><span><?php echo lang_get( 'custom_field_require_resolved' ) ?></span></label>
-				<span class="checkbox"><input type="checkbox" id="custom-field-require-resolved" name="require_resolved" value="1" <?php check_checked( $t_definition['require_resolved'] ) ?> /></span>
+				<span class="checkbox"><input type="checkbox" id="custom-field-require-resolved" name="require_resolved" value="1" <?php check_checked( (bool)$t_definition['require_resolved'] ) ?> /></span>
 				<span class="label-style"></span>
 			</div>
 			<div class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
 				<label for="custom-field-require-closed"><span><?php echo lang_get( 'custom_field_require_closed' ) ?></span></label>
-				<span class="checkbox"><input type="checkbox" id="custom-field-require-closed" name="require_closed" value="1" <?php check_checked( $t_definition['require_closed'] ) ?> /></span>
+				<span class="checkbox"><input type="checkbox" id="custom-field-require-closed" name="require_closed" value="1" <?php check_checked( (bool)$t_definition['require_closed'] ) ?> /></span>
 				<span class="label-style"></span>
 			</div>
 			<span class="submit-button"><input type="submit" class="button" value="<?php echo lang_get( 'update_custom_field_button' ) ?>" /></span>
diff --git a/manage_proj_cat_edit_page.php b/manage_proj_cat_edit_page.php
index a6e2d4c6df..422aaa9ac1 100644
--- a/manage_proj_cat_edit_page.php
+++ b/manage_proj_cat_edit_page.php
@@ -56,8 +56,8 @@
 $f_project_id		= gpc_get_int( 'project_id' );
 
 $t_row = category_get_row( $f_category_id );
-$t_assigned_to = $t_row['user_id'];
-$t_project_id = $t_row['project_id'];
+$t_assigned_to = (int)$t_row['user_id'];
+$t_project_id = (int)$t_row['project_id'];
 $t_name = $t_row['name'];
 
 access_ensure_project_level( config_get( 'manage_project_threshold' ), $t_project_id );
diff --git a/manage_proj_edit_page.php b/manage_proj_edit_page.php
index d2ff9c3297..10416cf418 100644
--- a/manage_proj_edit_page.php
+++ b/manage_proj_edit_page.php
@@ -105,26 +105,26 @@
 				<label for="project-status"><span><?php echo lang_get( 'status' ) ?></span></label>
 				<span class="select">
 					<select id="project-status" name="status">
-						<?php print_enum_string_option_list( 'project_status', $row['status'] ) ?>
+						<?php print_enum_string_option_list( 'project_status', (int)$row['status'] ) ?>
 					</select>
 				</span>
 				<span class="label-style"></span>
 			</div>
 			<div class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
 				<label for="project-enabled"><span><?php echo lang_get( 'enabled' ) ?></span></label>
-				<span class="checkbox"><input type="checkbox" id="project-enabled" name="enabled" <?php check_checked( $row['enabled'], ON ); ?> /></span>
+				<span class="checkbox"><input type="checkbox" id="project-enabled" name="enabled" <?php check_checked( (int)$row['enabled'], ON ); ?> /></span>
 				<span class="label-style"></span>
 			</div>
 			<div class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
 				<label for="project-inherit-global"><span><?php echo lang_get( 'inherit_global' ) ?></span></label>
-				<span class="checkbox"><input type="checkbox" id="project-inherit-global" name="inherit_global" <?php check_checked( $row['inherit_global'], ON ); ?> /></span>
+				<span class="checkbox"><input type="checkbox" id="project-inherit-global" name="inherit_global" <?php check_checked( (int)$row['inherit_global'], ON ); ?> /></span>
 				<span class="label-style"></span>
 			</div>
 			<div class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
 				<label for="project-view-state"><span><?php echo lang_get( 'view_status' ) ?></span></label>
 				<span class="select">
 					<select id="project-view-state" name="view_state">
-						<?php print_enum_string_option_list( 'view_state', $row['view_state']) ?>
+						<?php print_enum_string_option_list( 'view_state', (int)$row['view_state']) ?>
 					</select>
 				</span>
 				<span class="label-style"></span>
diff --git a/manage_user_edit_page.php b/manage_user_edit_page.php
index 9bbdd8a07b..b763fd07f4 100644
--- a/manage_user_edit_page.php
+++ b/manage_user_edit_page.php
@@ -141,7 +141,7 @@
 						if ( !MantisEnum::hasValue( config_get( 'access_levels_enum_string' ), $t_access_level ) ) {
 							$t_access_level = config_get( 'default_new_account_access_level' );
 						}
-						print_project_access_levels_option_list( $t_access_level ); ?>
+						print_project_access_levels_option_list( (int)$t_access_level ); ?>
 					</select>
 				</span>
 				<span class="label-style"></span>
@@ -149,13 +149,13 @@
 			<!-- Enabled Checkbox -->
 			<div class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
 				<label for="edit-enabled"><span><?php echo lang_get( 'enabled_label' ) ?></span></label>
-				<span class="checkbox"><input id="edit-enabled" type="checkbox" name="enabled" <?php check_checked( $t_user['enabled'], ON ); ?> /></span>
+				<span class="checkbox"><input id="edit-enabled" type="checkbox" name="enabled" <?php check_checked( (int)$t_user['enabled'], ON ); ?> /></span>
 				<span class="label-style"></span>
 			</div>
 			<!-- Protected Checkbox -->
 			<div class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
 				<label for="edit-protected"><span><?php echo lang_get( 'protected_label' ) ?></span></label>
-				<span class="checkbox"><input id="edit-protected" type="checkbox" name="protected" <?php check_checked( $t_user['protected'], ON ); ?> /></span>
+				<span class="checkbox"><input id="edit-protected" type="checkbox" name="protected" <?php check_checked( (int)$t_user['protected'], ON ); ?> /></span>
 				<span class="label-style"></span>
 			</div><?php
 			if ( config_get( 'enable_email_notification' ) == ON ) {
@@ -250,7 +250,7 @@
 				<label for="add-user-project-access"><span><?php echo lang_get( 'access_level_label' ) ?></span></label>
 				<span class="select">
 					<select id="add-user-project-access" name="access_level">
-						<?php print_project_access_levels_option_list( config_get( 'default_new_account_access_level' ) ) ?>
+						<?php print_project_access_levels_option_list( (int)config_get( 'default_new_account_access_level' ) ) ?>
 					</select>
 				</span>
 				<span class="label-style"></span>
diff --git a/tag_update_page.php b/tag_update_page.php
index 0d10bee9c2..29fba42bc2 100644
--- a/tag_update_page.php
+++ b/tag_update_page.php
@@ -96,7 +96,7 @@
 					if ( access_has_global_level( config_get( 'tag_edit_threshold' ) ) ) {
 						echo '<label for="tag-user-id"><span>', lang_get( 'tag_creator' ), '</span></label>';
 						echo '<span class="select"><select ', helper_get_tab_index(), ' id="tag-user-id" name="user_id">';
-						print_user_option_list( $t_tag_row['user_id'], ALL_PROJECTS, config_get( 'tag_create_threshold' ) );
+						print_user_option_list( (int)$t_tag_row['user_id'], ALL_PROJECTS, (int)config_get( 'tag_create_threshold' ) );
 						echo '</select></span>';
 					} else { ?>
 						<span class="display-label"><span><?php echo lang_get( 'tag_creator' ); ?></span></span>