Changes to get platform-v8080 running again