Minor changes to avoid hardcoded paths

should fix CI issues