Bug gingerbread fixes

a few tweaks based on testing of two 2.3.6 devices