fixes for uwa2