Fixed type juggling issues in bool mapping type