Little fixes about design