Strict standards fixes