Cleanups and spec fixes.