Punch List fixes