Fixing up some regression issues