#3797: Fixes for 0, 2, 3, 4.

#3797