DN2015 - Polishing, fixes