Two small extension related fixes.