More fixes for file paths and /tmp paths