imgbuilder: small fixes, cleanup
typo