Fix minor last-minute issues