Partial update to properly handle cameras.