Minor fixes

A few extra catches.