A few more fixes that'll actually allow this to work