Fixes and name