More import fixes for middleware 1.5