Couple small fixes

Vytas did it.