Fixes on the conversion operators