Bugfixes, Gingerbread compatibility (hopefully).