Small fixes from past