Update 2.0.4 Multiple fixes.