Additional fixes.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1' into 2.2
Merge branch '2.2'