Fix some issues with one line blocks