Carpentry first and second fix