Minor fixes to hopefully make it work

[ci skip]