Improvements for Matryoshka 0.4.x