More improvements for AMQ-5043.