more fixes/cleanups

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>