Few import fixes