Various playground cleanups