Warning cleanup
More