Fixes related to using absolute path to files