Commit cc3b693c6db5cabb76adcaf516b01ac45dda527e

Con Kolivas 2012-10-07T12:25:19

Minor warning fixes.