CPack script fixes