Fix for startup issues after last commit