Fix missing return statement
Fix build system for Windows