Fixed compile time warnings post merge.