Improve zip handling. Other minors