Fixes for windows 0.154 #230