Crash fix on latest incoming and warning cleanup