Fixed some runtime binding warnings

Change-Id: I6067b90e37cad0f0e49023f19f160428e1a16fb2