Fixing common import issues | NEXERA-PXM