[SQUASH ME] Fix some error + simplify some calls