Misc fixes - sometimes state names were not dealt with correctly.