Fix migrations that fail because of coupling to changed/removed models