fixing some label and complex field issues