Fix namespace clash with proc stuff an compilation warnings.