Little fixes on clean up for real device..