frameworks fixes