Minor code changes to aid compilation

Under SDK 2.8 it wouldn't compile.