Few fixes for form serializer