Add some casts I missed the first time around and a few misc. corrections.