Fixes for libzip1 and g++ 4.7