Small fix and missing stuff.