non-critical fixes\changes