Merged remaining changes from before in.