Fixes all remaining non-final errors