updates to remove warnings