Final fixes before official preview