system ui build fixes