Kristof's tweaks

Change-Id: I281280eac27d8751eee05aa3fbe3890faa5e14f7