Bug fixes on HIGH priority items