Small fixes and warnings remove