Upgraded again
Fixed up lint errors