Fixes at the end