Misc fixes related to Toro implementation

Change-Id: Ifdcd6d9e955e553187ef946e330421d1a7b7bc4c