Fixed open apk cancel function
Other few changes