Little fixes here and there.  No more warnings on build.