Minor fixes, no more boolean spam