Cleanup and additional fixes regarding procedures
Merge pull request #212 from soc/topic/procedures

Cleanup and additional fixes regarding procedures