Fix core strict standards errors

Fix core strict standards errors, see [#331]