More inlineform fixes