fix some -w flag issues too