More legacy meta-packages fixes