and small cleanups.

Change-Id: I9db6d7d5de32acd2ec1d757f27e4e3095dd5b1eb
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>