Update 3.0.4

Some fixes