Fixes in do scripts