Small fixes. Thanks Hana.