Minor changes after reviewing some files

Signed-off-by: Dan