Additional fixes to 0bb7fb7

Signed-off-by: crynobone <crynobone@gmail.com>