Make some tweaks to rendering logic and handle explicit blocks