fixes for module-focus