Concatenation order fixed and small improvements for Android 2.3