Small fixes for Kishore's module