Fix some issues with getting fields