Fixes and additions, general