Change handling strlong
Small changes