several fix hacks

Signed-off-by: Jeff Hilnbrand <jahilnbrand@gmail.com>