Fixed issues with null constructors