Some fixes proposed by Insight