Some small fixes after that big refacto