Some fixes - again