Log and settings fixes