Incomplete fixes for forms