Lint fixes + no hardcoded paths