Partial Fixes