Fixed more build errors