Qb fixes to match tutorial