Issue #90 Reapply 3.0.0.4 Update Fixes