Fix bugs like no tomorrow