[SQUASH]: Fix issues found in review