General fixes 19-11-14