Few fixes of config + screen lock