Fix for field types and exceptions.