All purposes fixes of issues