Fixes for executable path changes