Move constructors to types, some fixes