Fixed build
Fixed build nits