Speed fixes

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>