Small changes (ronnix comments)