Minox fixes to address comments