Improvements to glossmark handling