Fixing some more RUN, ENV etc. statements