Fixed several issues
Fixed several issues