Another batch of fixes from Annie