boolean fixes