Fixed: Public/static warnings