Fixes and fixes and fixes, oh my.