Minor project cleanups