Simple casting here and there to fix things up.
Signed-off-by: NChris Mason <chris.mason@oracle.com>