Fixed constructor issues
Fixed constructor issues