Minor code and warning fixes.

Probably last update last small update like this.