Quick start changes - fix tomorrow