File zip / misc fixes

- Credit to gmillz for block fix