Fix ups to build again.