wa-system fixes