Fix a few things as per Lars' review