Fixes for new extensibility changes