CONSTRUCT fixes