Procedures fixes.