More changes

Signed-off-by: Matt Oswalt <matt@keepingitclassless.net>