Some fixes for WAILA integration