Fix strict standards Closes #4980