Fixes in common library