Missing library recovery, bug fixes