Started working on a couple of fixes for empty images