fixes for forms