Minor changes needed to run on the N900