Fixes for system76/beansbooks#121 and system76/beansbooks#18