Fixed compile time warnings and formatting post merge.