fixes to borked merge

Signed-off-by: Jason Kuster <unexpectedapocalypse@gmail.com>