Small fixes :neckbeard: