More relative import fixes

getting the hang of this...