Constructions printing fix; switch small fix