Some more features, fix build for MSVC that broke in last commit