Make code questions robust enough for deployment