Some Minor updates, to fix some anoying messages