Fixed a few issues with default constructors