Fixes in CustomAdapter