Considering the remote before applying + Fix to comply with git.