Fixed build for NON Unix/Linux environment