A few more changes to the scheme to fix Travis