Fixes marked