-- Minor method reordering.
-- Integrated image fix.