Go away warnings
Small fixes