wa-system some fixes