Small changes to strings and adapters