Fixed missing constructors