Server config tweaks -2