Correct viewport definitions to support more locations