Minor changes while attempting to make project portable; still problems on original Windows machine