Update CPK gem, fix deprecation warnings in models