Changed image initialization/fixed includes