Bug Fixes

• Fix crash for non-PDM machines on startup.