Cleaning up some list/value issues