cover -> common & small fixes