Stability fixes for 0.3.5