Fix zip file copy and general cleanup