Fix some starup errors