Fix custom property support

I didn't end up needing custom properties, but here are a couple changes I had to make to get them working in case it is helpful.