fixed some disco / carbon related bugs