Just solving the bugs I created yesterday.