minor fixes for extension