Fix few things...