Workaround internal deprecation warnings
Clean up test:compile warnings