Hack some choking when building on windows
Fix(?) some null pointer issues