Some AS update bug fixing