Latest updates to fix issues w/ embedded images