Fixed minor issues ...