More decorator fixes