various fixes

Signed-off-by: Chris Warrick <kwpolska@gmail.com>