Random fixes to borks

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