portability fixes for wde project