Last checks on Bastiaan's review