Small fixes tasks