Fixed build
Fixed onInit - now it doesn't run when -D is supplied