Partial fixes