[PATCH 0/3] Spec cleanups