Minor Krazy Fixes

Some small cleanings found by Krazy.