Fixes for extension problems while installing/removing (still double-registration...