Fix bugs

Tags
Backlog
Date
Feb 1, 2021