change plugin and bundle behaviour to work better under windows