fixes for uSDLC2 and possibly some for other project