High priority fixes