Final WAS fixes