Bug fixes for 04, 08, and eVar19