minor fixes for cleaning enigma2