Fixes after 4.2.2 merge.

Signed-off-by: iceandfire <arhamjamal@gmail.com>