Improve pointer management, fix for PointerEvents