DERRRP

Fix a few things.