Fixed issues resulting from the pervious few merges.