Fixes and no trace