Clean up change of blockers functions.  Also fix issue #24