Final changes from tech check