more post-gingerbread fixes