0.99.30: Multiple fixes