Some fixes for CWM Recovery