Quick fixes and agenda skeleton.