WA-12: Loader.as and other changes