a few missing optionals