Fixes for vaccination