non-critical fixes