Sexy thing minor fixes