Smal fixes