Plugin loading improvements.