Fix couple of import paths