More fixes for HashBang.