Fix a few more bugs with /end