Fixes to CONSTRUCT_INTERFACE macro