non-critical fixes to reduce technical dept