Mitch's fixes to bypass initial screens