Updated to fix startup failures