Little fixes on theme