Fixed compile errors from raw types.

Signed-off-by: Timo Kinnunen <timo.kinnunen@gmail.com>