few bug fixes before new iso build