Fixed some minor errors missed during the merging from our local
changes