Fix build errors
Get the correct logger to prevent NPE