Fix several issues with Oxygen Bubble/Oxygen Distributor. Fixes #506