Fixed build and logger