fix errors in bug #135 and fix bug #66

I chose scala-internals@googlegroups.com as the maintainer email address. Correct me if wrong.