Standard label support and bug fixes