Fix bugs as needed
