Fixes for error messages encountered via update to 3.4