Some small mods to get a test debug version working locally.