Several fixes for module/action/what handling.