Merge plus small fix with first startup