A few more improvments