Config / Gameplay fixes