Fixed my series of broken commits