update and start fixes