Fixed some last-minute issues