Bug fix and spec fix.