fixes in import