Fix some relative imports not marked as such