Minor fixes to create new system functionality.