Fixed compile for nonstandard tools