Fix omega issues