Add fixes from concrete cesk