Fixes for changes in AlloSystem