Some fixes to work better inside an AdapterView & run faster.