Fixing lint warnings - === usage
Fixing more lint warnings