Fixed extension bugs