Import fixes, missing util function added