Fix bugs everywhere