Summary: Removed unnecessary castings and other warnings
Reviewed-by: alexp
Contributed-by: NFlorian Brunner <fbrunnerlist@gmx.ch>