Fixed build errors...