[FIX] Fixes several small bugs in Saros/I

These are all bugs where detected by running Saros/I from
master.

Change-Id: Idf7602311673d2cd75351c2a73e23aa0c1019d1e
Reviewed-on: http://saros-build.imp.fu-berlin.de/gerrit/2014
Tested-by: Jenkins CI
Reviewed-by: Matthias Bohnstedt <matthias.bohnstedt@gmail.com>
Reviewed-by: Christian Cikryt <c.cikryt@googlemail.com>
Reviewed-by: Franz Zieris <zieris@inf.fu-berlin.de>