Minor fixes BETA release