General fixing and additions