taking care of some warning flags