Last fix to W|A (hopefully) + Assorted fixes