+ Fixed build errors