Gingerbread fixes