Fix a few lint errors and make agenda work properly