Quick fixes to constructors