Assorted fixes & speed opts