Fixed Compilation issues that have arisen with the merge.