More local fixes.