Small fixes before sleep