fixes suggested by Eugene Yokota

See https://github.com/scala/scala.github.com/commit/71e0cdd2d981a51078e6e8ff4a9caeb391b83a21