Fix issues with BoardIconHandler