minor cleanups to remove warnings