Fix a whole bunch of new bugs as a result of the 0.1.0 key-finding update