Fixed paths issues and some zip problems