Fixing all of these now