Fixing references to <Boolean>