Additional extension system related fixes.