[0.9.4-dev] small changes/fixes