Fix some problem introduced by https://github.com/NFLabs/zeppelin/pull/94