Minor bug fixes and certification