AS mini fixes