Minor fizes

ok .. removed the commit from this PR