Fixes for 3.4.0-1 release