Fix some stupid bugs
draft
2020-01-31, Gary Kramlich