Minor Improvments