[Global] Fix various little stuff