small fixes for forms