Some changes to remove warnings