Some lingering changes from using settings