Small fix's