[0.4.0] Minor fixes