Small extensibility fixes