More bug fixen ...