Minor fixes

Fixed leftovers from last cleanup.