Spewp bug fixes