Fixing constructor errors
Fix constructor