<DE2 & Android> Fixed some bugs