Some fixes after @vandekeiser feedback