Improved carton.lock compatibility