Proper fixes for these compile fails.