compatibility fixes for current master
merged upstream changes, add comments from @chrismccord about allowing atom forms with render