Fixes for ldc