form API - fixes