Fixed little bugs appearing in Android environment