More 14.06 bug fixes.