More IDE work.