Build improvements
Fix image setup