Fixed build error
Fixed warnings
Fixed attributes names