A few more conversions

Signed-off-by: Steven Hoffman <git@fustrate.com>