Few fixes related to @elyezer review.