Fixing misc other things.