Small changes for operability