partial fixes
partial fixes