Additional fixes to 52f932b

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.0'