Minor changes to Procedure classes