Fixes for system76/beansbooks#82