Fixes to manual popup, signup, iPhone tracing