Fixed types and added constructors for old clang.