Fixed last errors before LIB TOURNAMENT 2014!!!!

Signed-off-by: Marcus Sundberg <marcussundbergtelia@github.com>