Minor changes by AS IDE