Fix null errors
Reliability and pref fixes.
Updated for new library locations.