Api Break fixes, Cleanup (Partial change - Don't Merge)