Yes, those would be good ways to fix it.