Fix *** warnings