Fix literal blocks and other cleanup