Fixed up custom tool compatibility