partial fixes