Fix few build errors