Tweaks for AOClabs