Fix a few places where 'props' column was being used in an unconventional way