Fix up lib importing and some image issues.