Fixes for system76/beansbooks#79
Fixes for system76/beansbooks#77 and system76/beansbooks#76
Fixes for system76/beansbooks#78
Another minor fix to go with system76/beansbooks#79