Some fixes for proof warnings