fixing some fields