Fix bugs

Tags
Backlog
Date
February 1, 2021