start fixes for agenda