Fixes for adding/deleting modules, apps