Try to resolve build errors