Fixes for all the bad data