4.4 bug fixes