Minor molecule cleanups (#401)