Cpack improvements