Added back autocompile and tweaked inline listeners