strict compiler fixes