several changes to fix workflow