Updates from punchlist