...aaaaand fixing 'em