Final boolean fixes