Fix (seemingly) the last holes in the model and the code