2325 and 2551 bug fixes