Fix Log messages & Remove statics