<DE2 & Android>Fix some minor things