Some strict standards fixes