Several fixs for constructions.
This is the most time consuming part.