Fixes (testing with 0.5.0 ages ago)