Fixed Small issues