[0.9.4-dev] Small changes