More things that were broken but now hopefully fixed