[0.3.0] Minor fixes