Bugfixes
https://docs.google.com/spreadsheets/d/1HfQN3BHuO4dTHOA6HAKVy4yiJK_pAhh-wcJrywXoVpE/edit?usp=sharing