Fixes for MD rendering