Framework fixes