Small fix's here and there