Fixes for forms