Minor fixes
minors
Systems fix