Simple fixes for type warnings

Just a few minor emendations to places where warnings were unneeded.