Some warning cleanup