Oops - forgot last minute fixes