Small fixes...