diff --git a/ssh-keys/tasks/non-root-ssh-keys.yml b/ssh-keys/tasks/non-root-ssh-keys.yml
index d2fed83e..602fe265 100644
--- a/ssh-keys/tasks/non-root-ssh-keys.yml
+++ b/ssh-keys/tasks/non-root-ssh-keys.yml
@@ -3,7 +3,7 @@
   authorized_key: user={{ item.0.name }} key="{{ item.1 }}" state=present
   when: non_root_users
   with_subelements:
-    - ssh_users_list
+    - '{{ ssh_users_list }}'
     - authorized_keys
   tags: [ "pubkeys", "ssh_keys" ]
 
@@ -13,6 +13,6 @@
     - obsolete_ssh_key is defined
     - non_root_users
   with_subelements:
-    - ssh_users_list
+    - '{{ ssh_users_list }}'
     - authorized_keys
   tags: [ "pubkeys", "ssh_keys" ]
diff --git a/ssh-keys/tasks/root-ssh-keys.yml b/ssh-keys/tasks/root-ssh-keys.yml
index 56192174..f77de47b 100644
--- a/ssh-keys/tasks/root-ssh-keys.yml
+++ b/ssh-keys/tasks/root-ssh-keys.yml
@@ -1,16 +1,12 @@
 ---
 - name: Install the ssh keys for the authorized users
   authorized_key: user=root key="{{ item }}" state=present
-  with_items: user_ssh_key
-  tags:
-    - pubkeys
-    - ssh_keys
+  with_items: '{{ user_ssh_key }}'
+  tags: [ 'pubkeys', 'ssh_keys' ]
 
 - name: Remove obsolete ssh keys if there are any
   authorized_key: user=root key="{{ item }}" state=absent
-  with_items: obsolete_ssh_key
+  with_items: '{{ obsolete_ssh_key }}'
   when: obsolete_ssh_key is defined
-  tags:
-    - pubkeys
-    - ssh_keys
+  tags: [ 'pubkeys', 'ssh_keys' ]
 
diff --git a/tomcat-multiple-instances/tasks/main.yml b/tomcat-multiple-instances/tasks/main.yml
index ade686df..0c1c38e1 100644
--- a/tomcat-multiple-instances/tasks/main.yml
+++ b/tomcat-multiple-instances/tasks/main.yml
@@ -96,12 +96,12 @@
   register: restart_needed
   notify:
     - tomcat restart instances with changed configs 
-  tags: [ 'tomcat', 'tomcat_instances', 'tomcat_conf' ]
+  tags: [ 'tomcat', 'tomcat_instances', 'tomcat_conf', 'tomcat_serverxml' ]
 
 - name: Install the instances startup scripts
   template: src=tomcat-instance.init.j2 dest=/etc/init.d/tomcat-instance-{{ item.http_port }} mode=0755 owner=root group=root
   with_items: '{{ tomcat_m_instances }}'
-  tags: [ 'tomcat', 'tomcat_instances' ]
+  tags: [ 'tomcat', 'tomcat_instances', 'tomcat_init' ]
 
 - name: Install the tomcat instances default file
   template: src=tomcat-default.j2 dest=/etc/default/tomcat-instance-{{ item.http_port }} mode=0640 owner=root group={{ item.user }}
@@ -109,7 +109,7 @@
   register: restart_needed
   notify:
     - tomcat restart instances with changed configs 
-  tags: [ 'tomcat', 'tomcat_instances', 'tomcat_conf' ]
+  tags: [ 'tomcat', 'tomcat_instances', 'tomcat_conf', 'tomcat_default' ]
 
 - name: Install a logrotate entry for the access log file
   template: src=tomcat.logrotate.j2 dest=/etc/logrotate.d/tomcat_instance-{{ item.http_port }} owner=root group=root mode=0644
diff --git a/tomcat/tasks/tomcat-pkgs.yml b/tomcat/tasks/tomcat-pkgs.yml
index 1efbd42b..184f8adc 100644
--- a/tomcat/tasks/tomcat-pkgs.yml
+++ b/tomcat/tasks/tomcat-pkgs.yml
@@ -13,19 +13,19 @@
   template: src=tomcat-default.j2 dest=/etc/default/tomcat{{ tomcat_version }}
   when: tomcat_install_default_conf
   notify: tomcat restart
-  tags: tomcat
+  tags: [ 'tomcat', 'tomcat_default' ]
 
 - name: Configure tomcat server.xml
   template: src=tomcat-server.xml.j2 dest={{ tomcat_conf_dir }}/server.xml
   when: tomcat_install_server_xml
   notify: tomcat restart
-  tags: tomcat
+  tags: [ 'tomcat', 'tomcat_serverxml' ]
 
 - name: Install a slightly modified catalina.properties
   copy: src=catalina.properties dest={{ tomcat_conf_dir }}/catalina.properties owner=root group={{ tomcat_user }} mode=0644
   when: tomcat_install_default_conf
   notify: tomcat restart
-  tags: tomcat
+  tags: [ 'tomcat', 'tomcat_catalinaprops' ]
 
 - name: Create some directories that the package do not creates itself
   file: dest={{ tomcat_catalina_home_dir }}/{{ item }} state=directory owner={{ tomcat_user }} group={{ tomcat_user }} mode=0755
diff --git a/ubuntu-deb-general/defaults/main.yml b/ubuntu-deb-general/defaults/main.yml
index 62645a14..c03cedb7 100644
--- a/ubuntu-deb-general/defaults/main.yml
+++ b/ubuntu-deb-general/defaults/main.yml
@@ -26,6 +26,7 @@ common_packages:
   - bash-completion
   - sudo
   - apt-transport-https
+  - nano
 
 # Set this variable in your playbook
 # additional_packages: