Attempting to fix a few regressions...