Some fixes for constructions