Fixes in Custom Field