Backport fixes from 1.2

Add all additional methods/fixes that are also applicable to FireFly 1.0.

Signed-off-by: Andrew Richardson <[email protected]>

Author: awrichar