Fixes for FIFO-457

Fixes for issue FIFO-457 and partial ui blocking of behavior mentioned in FIFO-460.
Also includes fix for FIFO-322