Minor updates. Read commit message for more info