Fixed image building errors