Strict standards fix
CS fixes