Multiple fixes

Is the above specific to your env?