Some changes for pass lint