Little fixes before big changes