Update for ASM deprecation warnings