Small screen and spec cleanups