work path bug fixes