Changed to use image_type bit field to determine os_type