Fixes and additions