Fixes from 0.41 and 0.42