Fixes for if block and boolean true/false