Fixed build process for CPK Core