Updates for 3.1.9 and settings