fixes for ruby 2.1.3

fixes for windows, plus fixes for solaris