Minor cleanup.
FOV support