Add final image config file, fix various issues when building