Bug fixes in extensions