Minor fixes for official release