Extensions API (none) and service catalog fix.