tweaks based on mox-server working for goggles/thimble/popcorn