[0.9.4-dev] some fixes
[0.9.4-dev] remove unused variable