Few fixes of high priority stuff