Quick fixes before the next commit