A couple of quikc design fixes