Two fixes for forms chapter