Fix few things