Form fixes and collection fixes