Some fixes to aspectj