Minor changes, fails to link on Windows