Fixes for WWW flag