Rail + QA3 fixes