cosmetoc fixes