Attempt to fix phpcs notices