Silented warnings
Minor tweaks