couple of fixes
last fix