full path bug fixes