minor fixes

minor fixes with redundant booleans