add some missing const and constructors