Improved carton.lock compat