Pre_start fixes