Small fixes

Batch of small fixes...