Fix up my last two horrendous commits