Misc size fixes which also cure some compiler warnings.

Özkan Sezer