Revert "Small fices to prevent some Strict Standards messages"

This reverts commit 2474210dab25290360e5db24f1d8092799e8dd92.