More build system fixes
PNG reading