Last improvements to boolean handling